iap10@labyrinth.cl.cam.ac.uk [Wed, 2 Feb 2005 09:23:32 +0000 (09:23 +0000)]
bitkeeper revision 1.1159.212.69 (42009c14_wjFIPRo2s6br4oGS3Ln-w)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
iap10@labyrinth.cl.cam.ac.uk [Wed, 2 Feb 2005 09:17:21 +0000 (09:17 +0000)]
bitkeeper revision 1.1159.223.57 (42009aa1vckOCJ3XiCz8SXnP4BQsFw)
Small hack to make CROMMULTISESSION ioctl return success rather than enosys, like we did on Xen 1.2.
From: Anthony Liguori aliguori@us.ibm.com
Signed-off-by: ian.pratt@cl.cam.ac.uk
iap10@pb001.cl.cam.ac.uk [Wed, 2 Feb 2005 00:26:53 +0000 (00:26 +0000)]
bitkeeper revision 1.1159.212.68 (42001e4d1AQiGV2pdPTNrs2AU2LjsQ)
Merge pb001.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into pb001.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk
iap10@labyrinth.cl.cam.ac.uk [Wed, 2 Feb 2005 00:22:15 +0000 (00:22 +0000)]
bitkeeper revision 1.1159.212.67 (42001d370Zk3jsfUjyC3iV9vgEJAlA)
Create the e820 map dynamically. This makes it easy to run VMX guests
of different memory sizes (no need to manually edit the e820 map).
Signed-off-by: Xin B Li <xin.b.li@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
iap10@labyrinth.cl.cam.ac.uk [Wed, 2 Feb 2005 00:14:39 +0000 (00:14 +0000)]
bitkeeper revision 1.1159.212.66 (42001b6f4kUEhmWXQmgg_vNH-AqiWQ)
Right now, the memory for the 1:1 physical mode page tables comes from the
VMX domain's memory. With this change, when the user asks for a domain with
M Megabytes of memory, we actually allocate M+N megabytes in xend, where
N is the memory for the page table pages.
This simplifies the code in the device models that maps guest memory (we
now map all of it) and the E820 map can also give the full M megabytes to
the guest.
Signed-off-by: Xin B Li <xin.b.li@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
iap10@labyrinth.cl.cam.ac.uk [Wed, 2 Feb 2005 00:12:05 +0000 (00:12 +0000)]
bitkeeper revision 1.1159.212.65 (42001ad5CoYcWQyfGjSHSJBFeqFrLg)
Make mmio_space() static inline.
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
kaf24@viper.(none) [Tue, 1 Feb 2005 23:14:14 +0000 (23:14 +0000)]
bitkeeper revision 1.1159.236.1 (42000d46U0ZeCEM9d6oFhwqrTrOgDg)
Merge ssh://kaf24@scramble.cl.cam.ac.uk//usr/groups/xeno/BK/xen-unstable.bk
into viper.(none):/home/kaf24/xen-unstable.bk
kaf24@viper.(none) [Tue, 1 Feb 2005 23:14:05 +0000 (23:14 +0000)]
bitkeeper revision 1.1159.235.1 (42000d3dwcPyT8aY4VIPYGCfCAJuQQ)
More x86/64. Status: traps.c now included in the build, but actual building
of IDT doesn't happen, and we need some sort of entry.S. More page-table
building required so that arch_init_memory() can work. And there is something
odd with MP-table parsing; I currently suspect that __init sections are
causing problems.
Signed-off-by: keir.fraser@cl.cam.ac.uk
iap10@labyrinth.cl.cam.ac.uk [Tue, 1 Feb 2005 22:32:01 +0000 (22:32 +0000)]
bitkeeper revision 1.1159.212.64 (42000361XrdUoEK_vD6RMga2eLmwZg)
Allow specification of backend vif MAC addresses. If a backend
MAC is not provided, generate one as before
Signed-off-by: Jody Belka <knew-xen@pimb.org>
Signed-off-by: ian.pratt@cl.cam.ac.uk
iap10@labyrinth.cl.cam.ac.uk [Tue, 1 Feb 2005 22:05:38 +0000 (22:05 +0000)]
bitkeeper revision 1.1159.212.63 (41fffd320J5fzfKolmEyIb6tg5-a_w)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
iap10@labyrinth.cl.cam.ac.uk [Tue, 1 Feb 2005 21:59:12 +0000 (21:59 +0000)]
bitkeeper revision 1.1159.223.56 (41fffbb0baSUSOWVCJ_0NFmEtCmUkw)
Fix the device number calculation for /dev/hd* device names;
ide device numbering works differently to scsi
Signed-off-by: Jody Belka <knew-xen@pimb.org>
Signed-off-by: ian.pratt@cl.cam.ac.uk
iap10@labyrinth.cl.cam.ac.uk [Tue, 1 Feb 2005 21:55:39 +0000 (21:55 +0000)]
bitkeeper revision 1.1159.223.55 (41fffadb9KX8y2tjTwUVGZRrZQdJ2g)
Fix incorrect result-check in xlvbd_init_device
Signed-off-by: Jody Belka <knew-xen@pimb.org>
Signed-off-by: ian.pratt@cl.cam.ac.uk
kaf24@scramble.cl.cam.ac.uk [Tue, 1 Feb 2005 21:26:34 +0000 (21:26 +0000)]
bitkeeper revision 1.1159.212.62 (41fff40aESe4aWS82z_rLHeonXpxuQ)
More x86/64 stuff.
Signed-off-by: keir.fraser@cl.cam.ac.uk
kaf24@scramble.cl.cam.ac.uk [Tue, 1 Feb 2005 09:24:57 +0000 (09:24 +0000)]
bitkeeper revision 1.1159.212.61 (41ff4ae9QGwwPUv_OONjfk2SaSj0dw)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
kaf24@scramble.cl.cam.ac.uk [Tue, 1 Feb 2005 09:21:09 +0000 (09:21 +0000)]
bitkeeper revision 1.1159.223.54 (41ff4a05JwUWXLAjyzybyxNxCOE3yw)
Defer NMI that cannot be handled, instead of dropping it completely.
kaf24@viper.(none) [Mon, 31 Jan 2005 23:16:27 +0000 (23:16 +0000)]
bitkeeper revision 1.1159.212.60 (41febc4bKKSkh9u-Zes9v2CmBuLZxA)
More bootstrap fixes for x86/64. Next thing to do is sort out the IDT and
get traps.c working; then we can get rid of a bunch of dummy labels from
end of boot/x86_64.S. We're also going to need some kind of entry.S before
we can safely enable interrupts. Also bear in mind that not all of physical
RAM may be mapped (only first 1GB) and no m2p table is yet allocated or
mapped. Plenty to be done!
iap10@labyrinth.cl.cam.ac.uk [Sat, 29 Jan 2005 22:42:20 +0000 (22:42 +0000)]
bitkeeper revision 1.1159.212.59 (41fc114c3QNYidj-HaO5jjZA5jbgpQ)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
iap10@labyrinth.cl.cam.ac.uk [Sat, 29 Jan 2005 22:20:09 +0000 (22:20 +0000)]
bitkeeper revision 1.1159.223.53 (41fc0c19tGe1rM62SUQk8WYZjH-D1Q)
Add iptables modules to the default xen0 kernel, and add example configuration files for a NAT setup.
kaf24@viper.(none) [Sat, 29 Jan 2005 12:04:19 +0000 (12:04 +0000)]
bitkeeper revision 1.1159.212.58 (41fb7bc3vOj1TsfbXqfUKqcc2wjisA)
Merge viper.(none):/home/kaf24/xen-2.0-testing.bk
into viper.(none):/home/kaf24/xen-unstable.bk
kaf24@viper.(none) [Sat, 29 Jan 2005 12:03:44 +0000 (12:03 +0000)]
bitkeeper revision 1.1159.223.52 (41fb7ba0KYbuQ5SmW1MZjMO0P-RCew)
Small build fixes. Xen and XenLinux now build for x86_32 from within an
x86_64 build environment if you set TARGET_ARCH=x86_32.
iap10@labyrinth.cl.cam.ac.uk [Sat, 29 Jan 2005 09:13:48 +0000 (09:13 +0000)]
bitkeeper revision 1.1159.212.57 (41fb53cc8wKjvhd8TsN4YHhUYPQCdQ)
Currently xcs is run by xend in xen-unstable by simply making it a child
process. If you launch xend from an ssh session, the session won't exit
because the xcs still is connected to it's controlling terminal.
xcs should daemonize itself to prevent this from happening. This patch
does that along with making the domain id => port mapping dynamically
allocated.
Signed-off-by: Anthony Liguori aliguori@us.ibm.com
kaf24@scramble.cl.cam.ac.uk [Fri, 28 Jan 2005 23:26:21 +0000 (23:26 +0000)]
bitkeeper revision 1.1159.212.56 (41faca1d8ReaIESo4E0ltuhh1uQMSg)
Enable ne2k driver in ioemu tools.
Signed-off-by: Xin B Li <xin..b.li@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: Keir Fraser <keir.fraser@intel.com>
kaf24@scramble.cl.cam.ac.uk [Fri, 28 Jan 2005 23:22:36 +0000 (23:22 +0000)]
bitkeeper revision 1.1159.212.55 (41fac93cdxxGNb_EjYMGmT6Ezzwr3g)
Use -O2 instead of -g when building ioemu tools.
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: Keir Fraser <keir.fraser@intel.com>
kaf24@scramble.cl.cam.ac.uk [Fri, 28 Jan 2005 23:19:59 +0000 (23:19 +0000)]
bitkeeper revision 1.1159.212.54 (41fac89fnck8lIgXT0fcIHlQ9aM_7Q)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
kaf24@scramble.cl.cam.ac.uk [Fri, 28 Jan 2005 23:19:23 +0000 (23:19 +0000)]
bitkeeper revision 1.1159.223.51 (41fac87bR5uD5TAFu58tuaTMLSmbrw)
Fix makefiles creating copies instead of symlinks of shared libs.
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: Keir Fraser <keir.fraser@intel.com>
iap10@labyrinth.cl.cam.ac.uk [Fri, 28 Jan 2005 22:30:30 +0000 (22:30 +0000)]
bitkeeper revision 1.1159.212.53 (41fabd0652DGdYKsgWToGTyAOUlZKg)
Fix the direction flag for string I/O instructions -- missing hunk from earlier patch
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
Signed-off-by: Chengyuan Li <chengyuan.li@intel.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
kaf24@scramble.cl.cam.ac.uk [Fri, 28 Jan 2005 16:34:08 +0000 (16:34 +0000)]
bitkeeper revision 1.1159.212.52 (41fa6980PfhDt-hKCfacnyHcFB7DNQ)
Make page allocator 64-bit safe.
Signed-off-by: keir.fraser@cl.cam.ac.uk
kaf24@firebug.cl.cam.ac.uk [Fri, 28 Jan 2005 15:39:56 +0000 (15:39 +0000)]
bitkeeper revision 1.1159.212.51 (41fa5cccoJa4CtdiYB99zon6qwiusw)
Merge firebug.cl.cam.ac.uk:/auto/anfs/scratch/scramble/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/auto/anfs/scratch/scramble/kaf24/xen-unstable.bk
kaf24@scramble.cl.cam.ac.uk [Fri, 28 Jan 2005 15:39:31 +0000 (15:39 +0000)]
bitkeeper revision 1.1159.223.50 (41fa5cb3P9qKPSczsZkXrCrJzdeZAg)
Linker fixes.
kaf24@scramble.cl.cam.ac.uk [Fri, 28 Jan 2005 15:07:56 +0000 (15:07 +0000)]
bitkeeper revision 1.1159.212.50 (41fa554clYHeeIIyte3pO2pIPs3oLw)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
kaf24@scramble.cl.cam.ac.uk [Fri, 28 Jan 2005 15:07:36 +0000 (15:07 +0000)]
bitkeeper revision 1.1159.223.49 (41fa5538VkhzExY3oLvE43gn3nUTRQ)
trivial elf-parsing fix.
kaf24@firebug.cl.cam.ac.uk [Fri, 28 Jan 2005 13:55:00 +0000 (13:55 +0000)]
bitkeeper revision 1.1159.212.49 (41fa4434nLllzsfL7vjx8HW46L4qtA)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into firebug.cl.cam.ac.uk:/auto/anfs/scratch/scramble/kaf24/xen-unstable.bk
kaf24@firebug.cl.cam.ac.uk [Fri, 28 Jan 2005 13:54:34 +0000 (13:54 +0000)]
bitkeeper revision 1.1159.231.14 (41fa441azB6742PriyqlRlCP_gJ0Tw)
Build and x86/64 fixes.
Signed-off-by: keir.fraser@cl.cam.ac.uk
mwilli2@equilibrium.research [Fri, 28 Jan 2005 13:39:03 +0000 (13:39 +0000)]
bitkeeper revision 1.1159.212.48 (41fa4077FWhTpWbD65XTzGwOfmTJOQ)
Merge ssh://srg//auto/groups/xeno/BK/xeno.bk
into equilibrium.research:/home/irchomes/mwilli2/src/xen-3.0-devel.bk
kaf24@scramble.cl.cam.ac.uk [Fri, 28 Jan 2005 08:40:24 +0000 (08:40 +0000)]
bitkeeper revision 1.1159.231.13 (41f9fa78wq859knq7_QhJHbyMTORCw)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
mwilli2@equilibrium.research [Thu, 27 Jan 2005 23:55:18 +0000 (23:55 +0000)]
bitkeeper revision 1.1159.212.47 (41f97f66xOoJsNNqdPQ2dvZmBkFoHw)
Import hcd.c from vanilla Linux. Required a couple of ifdefs to
make 2.4 xenU domains compile with USB support.
Signed-off-by: mark.williamson@cl.cam.ac.uk
iap10@labyrinth.cl.cam.ac.uk [Thu, 27 Jan 2005 23:53:26 +0000 (23:53 +0000)]
bitkeeper revision 1.1159.231.12 (41f97ef6r1c2TDcgR-o8jFV1IWm5dA)
Lean decoder for MMIO instructions.
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
Signed-off-by: Chengyuan Li <chengyuan.li@intel.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
iap10@labyrinth.cl.cam.ac.uk [Thu, 27 Jan 2005 23:49:46 +0000 (23:49 +0000)]
bitkeeper revision 1.1159.231.11 (41f97e1amKuDHSrW5ZWKsTy4ZIfNRA)
Fix the direction flag for string I/O instructions.
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
Signed-off-by: Chengyuan Li <chengyuan.li@intel.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
iap10@labyrinth.cl.cam.ac.uk [Thu, 27 Jan 2005 23:45:32 +0000 (23:45 +0000)]
bitkeeper revision 1.1159.231.10 (41f97d1c7VgcW6eh60Nx2MTEdlYhkQ)
Free pages for VMX domain at domain termination.
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
iap10@labyrinth.cl.cam.ac.uk [Thu, 27 Jan 2005 23:42:08 +0000 (23:42 +0000)]
bitkeeper revision 1.1159.231.9 (41f97c50Eg32TPmD9lVOyWCldhbhDA)
Some guests depend on getting a #GP fault in order to boot. This patch
makes sure that the GP fault is injected into the guest properly.
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
mwilli2@equilibrium.research [Thu, 27 Jan 2005 20:45:16 +0000 (20:45 +0000)]
bitkeeper revision 1.1159.212.46 (41f952dcjUM7tDOqBgJxR2_d9qUROA)
Merge
cl349@arcadians.cl.cam.ac.uk [Thu, 27 Jan 2005 18:05:01 +0000 (18:05 +0000)]
bitkeeper revision 1.1159.231.8 (41f92d4dBn-4k24hnQtAJIjhmWfRjQ)
Merge changes from 2.0-testing.
Signed-off-by: c@pin.lu
cl349@arcadians.cl.cam.ac.uk [Thu, 27 Jan 2005 17:09:35 +0000 (17:09 +0000)]
bitkeeper revision 1.1159.223.48 (41f9204fFDaBv7jCdF63bwx5zXNlNA)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen-2.0-testing.bk
cl349@arcadians.cl.cam.ac.uk [Thu, 27 Jan 2005 17:09:14 +0000 (17:09 +0000)]
bitkeeper revision 1.1159.234.1 (41f9203a3hESfmWBG29VVoqa-chOrA)
Build system cleanups.
Signed-off-by: c@pin.lu
akw27@labyrinth.cl.cam.ac.uk [Thu, 27 Jan 2005 16:16:19 +0000 (16:16 +0000)]
bitkeeper revision 1.1159.231.7 (41f913d39TdyKRddqjGU3m60tTUoUQ)
Remove excessive debug messages from xend/xcs interface code.
kaf24@scramble.cl.cam.ac.uk [Thu, 27 Jan 2005 16:03:53 +0000 (16:03 +0000)]
bitkeeper revision 1.1159.233.1 (41f910e9AmctVZRfu78RAYbPnw3W8g)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
kaf24@scramble.cl.cam.ac.uk [Thu, 27 Jan 2005 16:02:39 +0000 (16:02 +0000)]
bitkeeper revision 1.1159.223.47 (41f9109fKznqwLcV_lTngHAhBvwOZw)
Minor domU net-backend fixes.
akw27@labyrinth.cl.cam.ac.uk [Thu, 27 Jan 2005 13:52:54 +0000 (13:52 +0000)]
bitkeeper revision 1.1159.231.6 (41f8f23655WnqWddc7mgFdntdfBkQw)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/nos1/akw27/xeno-clone/xeno.bk
akw27@labyrinth.cl.cam.ac.uk [Thu, 27 Jan 2005 13:52:24 +0000 (13:52 +0000)]
bitkeeper revision 1.1159.232.1 (41f8f218XdvlXPM9Yr37e6XnpOV70g)
minor fix from Grzegorz.
kaf24@scramble.cl.cam.ac.uk [Thu, 27 Jan 2005 13:47:18 +0000 (13:47 +0000)]
bitkeeper revision 1.1159.231.5 (
41f8f0e6-JhtoPT6MWfYIG_yE-lEtQ)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
kaf24@scramble.cl.cam.ac.uk [Thu, 27 Jan 2005 13:47:05 +0000 (13:47 +0000)]
bitkeeper revision 1.1159.223.46 (41f8f0d9VFDhRZsmMXXU3I_OEu8ADQ)
silly mistake...
kaf24@scramble.cl.cam.ac.uk [Thu, 27 Jan 2005 13:45:50 +0000 (13:45 +0000)]
bitkeeper revision 1.1159.231.4 (41f8f08eWBTp4qKNEBUg8ioSZa9yqA)
Makefile fix.
kaf24@scramble.cl.cam.ac.uk [Thu, 27 Jan 2005 13:45:01 +0000 (13:45 +0000)]
bitkeeper revision 1.1159.231.3 (41f8f05dMzf8t3Dot3Utpuos9U5nYg)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
kaf24@scramble.cl.cam.ac.uk [Thu, 27 Jan 2005 13:44:41 +0000 (13:44 +0000)]
bitkeeper revision 1.1159.223.45 (41f8f049ZJjSGVQ7S0Y7kGBwMIZfZQ)
No longer override target arch with ARCH but instead use TARGET_ARCH.
Xen now requires specification of TARGET_ARCH alone, not TARGET_ARCH
and TARGET_SUBARCH. Xen derives correct internal ARCH/SUBARCH components
automatically.
kaf24@scramble.cl.cam.ac.uk [Thu, 27 Jan 2005 10:53:58 +0000 (10:53 +0000)]
bitkeeper revision 1.1159.231.2 (41f8c846X6nmyCraD342rP9SirCaqg)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
kaf24@scramble.cl.cam.ac.uk [Thu, 27 Jan 2005 10:53:38 +0000 (10:53 +0000)]
bitkeeper revision 1.1159.223.44 (41f8c832pMZZ7WmykH_gAUBQHtPF1A)
Allow target architecture to be specified by specifying ARCH variable to
root Makefile (e.g, make ARCH=x86_32).
kaf24@scramble.cl.cam.ac.uk [Thu, 27 Jan 2005 09:56:50 +0000 (09:56 +0000)]
bitkeeper revision 1.1159.231.1 (41f8bae2s9o7h5KwwATuevKL21IxcQ)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
iap10@freefall.cl.cam.ac.uk [Wed, 26 Jan 2005 20:15:25 +0000 (20:15 +0000)]
bitkeeper revision 1.1159.223.43 (41f7fa5dY-DhsXNFoEJlVfLdK5MEXQ)
fix missing space
harry@dory.(none) [Wed, 26 Jan 2005 13:09:50 +0000 (13:09 +0000)]
bitkeeper revision 1.1159.212.45 (41f7969elyNTzsGsx57vqxgKK9SrRQ)
This change set moves the USB back and front end driver source code from
the 2.4 sparse tree to the 2.6 sparse tree in preparation for porting the
usb virtualization to 2.6.
This change set makes changes to the 2.4 mkbuildtree necessary to link
the files back into the 2.4 tree to preserve the previous usb
functionality for the 2.4 kernel.
The usbif.h file is also moved to be consistent with the location of the
netif.h file and necessary changes made to #include directives.
The usb code in the 2.6 tree is not yet integrated with the 2.6 build
process so the 2.6 build does not attempt to build it.
Tested with make world for both *2.4* and *2.6*.
Signed-off-by: butterwo@uk.ibm.com
kaf24@scramble.cl.cam.ac.uk [Wed, 26 Jan 2005 10:56:34 +0000 (10:56 +0000)]
bitkeeper revision 1.1159.212.44 (41f77762AXzU93deGpv_Z5doFw4oeg)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
kaf24@scramble.cl.cam.ac.uk [Wed, 26 Jan 2005 10:56:17 +0000 (10:56 +0000)]
bitkeeper revision 1.1159.223.42 (41f77751X73w7_t6jI0dgGV6N-Bweg)
More build system fixes and tweaks.
kaf24@scramble.cl.cam.ac.uk [Tue, 25 Jan 2005 17:57:49 +0000 (17:57 +0000)]
bitkeeper revision 1.1159.212.43 (41f6889dsyi21HaKtveW23DPeBwliw)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
kaf24@scramble.cl.cam.ac.uk [Tue, 25 Jan 2005 17:57:23 +0000 (17:57 +0000)]
bitkeeper revision 1.1159.223.41 (41f68883FaU7hVfFtWiOkCPnI6N1Hw)
Fix root Makefile so that targets only install to / if you do a
'make install'. All other targets will install to local dist directory,
as before.
kaf24@scramble.cl.cam.ac.uk [Tue, 25 Jan 2005 16:51:25 +0000 (16:51 +0000)]
bitkeeper revision 1.1159.212.42 (41f6790d_JgecZcMdZzpMtjaR5vjUg)
Upgrade library version numbers.
kaf24@scramble.cl.cam.ac.uk [Tue, 25 Jan 2005 16:48:58 +0000 (16:48 +0000)]
bitkeeper revision 1.1159.212.41 (41f6787aKvcI0-k3FYgkk8w74QD5gg)
manual merge.
kaf24@scramble.cl.cam.ac.uk [Tue, 25 Jan 2005 16:41:47 +0000 (16:41 +0000)]
bitkeeper revision 1.1159.223.40 (41f676cbajLGqFeWFqajtJ3X4OkgoA)
Build system fixes.
Signed-off-by: keir.fraser@cl.cam.ac.uk
kaf24@scramble.cl.cam.ac.uk [Tue, 25 Jan 2005 15:59:28 +0000 (15:59 +0000)]
bitkeeper revision 1.1159.223.39 (41f66ce0jpkVCVDUEA2oOsgUQP1D9A)
Cset exclude: iap10@labyrinth.cl.cam.ac.uk|ChangeSet|
20050122213003|38297
kaf24@scramble.cl.cam.ac.uk [Tue, 25 Jan 2005 15:38:35 +0000 (15:38 +0000)]
bitkeeper revision 1.1159.212.40 (41f667fbP4KshcjcLhVmqCqa5bsEuw)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
iap10@tetris.cl.cam.ac.uk [Tue, 25 Jan 2005 15:37:49 +0000 (15:37 +0000)]
bitkeeper revision 1.1159.223.38 (41f667cdBlErg8MU1cuAekL1VC008w)
More fixes to the build system further to earlier patch.
Signed-off-by: ian.pratt@cl.cam.ac.uk
kaf24@scramble.cl.cam.ac.uk [Tue, 25 Jan 2005 14:16:56 +0000 (14:16 +0000)]
bitkeeper revision 1.1159.212.39 (41f654d8oXg3D1jTyrHKYjWTMVzAew)
manual merge.
kaf24@scramble.cl.cam.ac.uk [Tue, 25 Jan 2005 14:11:06 +0000 (14:11 +0000)]
bitkeeper revision 1.1159.212.38 (41f6537aX7dfqsdH6-jWzX24faBDtQ)
manual merge.
kaf24@scramble.cl.cam.ac.uk [Tue, 25 Jan 2005 14:05:48 +0000 (14:05 +0000)]
bitkeeper revision 1.1159.223.37 (41f6523c0V0_vPJzozd6Y_LEESYzzA)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
kaf24@scramble.cl.cam.ac.uk [Tue, 25 Jan 2005 14:05:40 +0000 (14:05 +0000)]
bitkeeper revision 1.1159.230.2 (41f65234Pi4Crimteaw690fX-H8jyg)
Use list_for_each_entry() in preference to list_for_each().
signed-off-by: keir.fraser@cl.cam.ac.uk
kaf24@scramble.cl.cam.ac.uk [Tue, 25 Jan 2005 14:05:02 +0000 (14:05 +0000)]
bitkeeper revision 1.1159.230.1 (41f6520ec91dTdY6i_ggr80c6cRooQ)
Fix Xen dependencies and always rebuild arch/x86/setup.o rather than
common/kernel.o (boot banner was moved out to arch-specific).
signed-off-by: keir.fraser@cl.cam.ac.uk
iap10@freefall.cl.cam.ac.uk [Tue, 25 Jan 2005 13:08:25 +0000 (13:08 +0000)]
bitkeeper revision 1.1159.223.36 (41f644c9famqz8rwdr0g7NzC9KVv3g)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
iap10@freefall.cl.cam.ac.uk [Tue, 25 Jan 2005 13:08:13 +0000 (13:08 +0000)]
bitkeeper revision 1.1159.229.2 (41f644bdEYN9P3oj15IyKySMNPk1yg)
Fix "make dist" target in tools directory.
Signed-off-by: michael.fetterman@cl.cam.ac.uk
Signed-off-by: ian.pratt@cl.cam.ac.uk
iap10@freefall.cl.cam.ac.uk [Tue, 25 Jan 2005 13:06:39 +0000 (13:06 +0000)]
bitkeeper revision 1.1159.229.1 (41f6445fD7VhZd6QcRqU9K9iqEPPzQ)
Don't silently ignore failures while building kernels.
Signed-off-by: michael.fetterman@cl.cam.ac.uk
Signed-off-by: ian.pratt@cl.cam.ac.uk
kaf24@scramble.cl.cam.ac.uk [Tue, 25 Jan 2005 13:05:49 +0000 (13:05 +0000)]
bitkeeper revision 1.1159.212.37 (41f6442d0VIx4x9hYxFJgoaH6RGtRg)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
kaf24@scramble.cl.cam.ac.uk [Tue, 25 Jan 2005 13:05:37 +0000 (13:05 +0000)]
bitkeeper revision 1.1159.223.35 (41f64421LB8rsesmi-im4VxTqnNVhg)
Don't check in banner.h.
iap10@freefall.cl.cam.ac.uk [Tue, 25 Jan 2005 02:44:14 +0000 (02:44 +0000)]
bitkeeper revision 1.1159.212.36 (41f5b27eVQ8sFZbTAxrN9sb2Nbirbg)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xeno.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk
iap10@freefall.cl.cam.ac.uk [Tue, 25 Jan 2005 02:43:50 +0000 (02:43 +0000)]
bitkeeper revision 1.1159.228.1 (41f5b266Q7RVJ_3Cm0VymUcoULLZ2g)
Makefile fix prefix -> DESTDIR
Signed-off-by: ian.pratt@cl.cam.ac.uk
iap10@labyrinth.cl.cam.ac.uk [Tue, 25 Jan 2005 02:25:44 +0000 (02:25 +0000)]
bitkeeper revision 1.1159.212.35 (41f5ae28rGX5ZRYjiv0VTWqCmka9oA)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
iap10@labyrinth.cl.cam.ac.uk [Tue, 25 Jan 2005 02:23:49 +0000 (02:23 +0000)]
bitkeeper revision 1.1159.223.34 (41f5adb5w-LSQUPVS2ApmlrBDOFN4A)
"mv -f" fix
Signed-off-by: ian.pratt@cl.cam.ac.uk
iap10@freefall.cl.cam.ac.uk [Tue, 25 Jan 2005 01:36:09 +0000 (01:36 +0000)]
bitkeeper revision 1.1159.212.34 (41f5a289J4SAf6zaQUhGEBrQWQ14dA)
manual merge
iap10@freefall.cl.cam.ac.uk [Tue, 25 Jan 2005 01:25:26 +0000 (01:25 +0000)]
bitkeeper revision 1.1159.223.33 (41f5a006O57aqVcLmvmGSgDN2Chvbw)
install.sh now creates vmlinuz-2.6.99-xen0 -> vmlinuz-2.6-xen0 links etc
Signed-off-by: pl@us.ibm.com
Signed-off-by: ian.pratt@cl.cam.ac.uk
iap10@freefall.cl.cam.ac.uk [Tue, 25 Jan 2005 01:00:05 +0000 (01:00 +0000)]
bitkeeper revision 1.1159.223.32 (41f59a1519YIchUo4ggA1xTruDvUZg)
Bitkeeper ignore *.opic
Signed-off-by: ian.pratt@cl.cam.ac.uk
iap10@freefall.cl.cam.ac.uk [Tue, 25 Jan 2005 00:58:36 +0000 (00:58 +0000)]
bitkeeper revision 1.1159.223.31 (41f599bcklevTYwPtWQUZ7QK-azDbg)
Fix recent patch to change the way the version string is generated.
Signed-off-by: ian.pratt@cl.cam.ac.uk
iap10@pb007.cl.cam.ac.uk [Mon, 24 Jan 2005 22:54:02 +0000 (22:54 +0000)]
bitkeeper revision 1.1159.223.30 (41f57c8aGPV5CqOP-AQvc0TjHU_n8A)
Merge pb007.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into pb007.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
iap10@labyrinth.cl.cam.ac.uk [Mon, 24 Jan 2005 22:34:15 +0000 (22:34 +0000)]
bitkeeper revision 1.1159.223.29 (41f577e7ZJYpBbgJi8udTXWyfHvSYg)
Cset exclude: iap10@labyrinth.cl.cam.ac.uk|ChangeSet|
20050122214333|39257
iap10@labyrinth.cl.cam.ac.uk [Mon, 24 Jan 2005 20:37:34 +0000 (20:37 +0000)]
bitkeeper revision 1.1159.226.3 (41f55c8er11pRwXCJ66we1vDzrEZ9Q)
With ipv6, every network interface always has a link local
address. This fools the network script into thinking that
xen-br0 already has a network address, and it refuses to
transfer over eth0's IP address to xen-br0.
By grepping for 'inet ' instead of just 'inet', the network
script is no longer fooled and does the right thing. This
patch makes Xen networking work again on my Fedora system.
Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
mafetter@fleming.research [Mon, 24 Jan 2005 17:35:09 +0000 (17:35 +0000)]
bitkeeper revision 1.1159.212.33 (41f531cdecFyszGvLVL84IsM0Lk6XA)
Merge maf46@ssh-relay1.cl.cam.ac.uk:/usr/groups/xeno/BK/xen-unstable.bk
into fleming.research:/scratch/fleming/mafetter/xen.work
kaf24@scramble.cl.cam.ac.uk [Mon, 24 Jan 2005 17:31:27 +0000 (17:31 +0000)]
bitkeeper revision 1.1159.227.1 (41f530efSmK6bvjzrLTJ-C5-uso9Gw)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
kaf24@scramble.cl.cam.ac.uk [Mon, 24 Jan 2005 17:30:59 +0000 (17:30 +0000)]
bitkeeper revision 1.1159.226.2 (41f530d3LtbkTKUSgcI8LiQlQRJG0w)
Fix Xen's linker command line.
mafetter@fleming.research [Mon, 24 Jan 2005 17:21:09 +0000 (17:21 +0000)]
bitkeeper revision 1.1159.212.32 (41f52e85gOYv1psQvvvGKUO2GgOFuQ)
Don't silently ignore failures while building kernels.
Signed-off-by: michael.fetterman@cl.cam.ac.uk
mafetter@fleming.research [Mon, 24 Jan 2005 16:54:09 +0000 (16:54 +0000)]
bitkeeper revision 1.1159.212.31 (
41f52831-7xkHV9BTxL0wcBF2Ad-aQ)
Added a minor amount of hypercall argument validation to do_boot_vcpu()
Signed-off-by: michael.fetterman@cl.cam.ac.uk
mafetter@fleming.research [Mon, 24 Jan 2005 16:47:08 +0000 (16:47 +0000)]
bitkeeper revision 1.1159.212.30 (41f5268cMEdHLMEMs4o0SWqVEHZvuw)
Minor cleanup. Removed some duplicate MSRs, fixed some MSR names,
added a few new MSRs and MSR bit fields.
Signed-off-by: michael.fetterman@cl.cam.ac.uk
mafetter@fleming.research [Mon, 24 Jan 2005 16:46:25 +0000 (16:46 +0000)]
bitkeeper revision 1.1159.212.29 (41f52661zl13-gZj4XsM7cd6-Euz8g)
Added .S files to "make TAGS"
Signed-off-by: michael.fetterman@cl.cam.ac.uk
mafetter@fleming.research [Mon, 24 Jan 2005 16:45:07 +0000 (16:45 +0000)]
bitkeeper revision 1.1159.212.28 (41f52613d166fIDYJZGw5d_4kBSg5w)
Fix "make dist" target in tools directory.
Signed-off-by: michael.fetterman@cl.cam.ac.uk
kaf24@scramble.cl.cam.ac.uk [Sun, 23 Jan 2005 13:28:26 +0000 (13:28 +0000)]
bitkeeper revision 1.1159.212.27 (41f3a67aXzSi2IH-s4Tr3Xrk_85v6Q)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
kaf24@scramble.cl.cam.ac.uk [Sun, 23 Jan 2005 13:27:13 +0000 (13:27 +0000)]
bitkeeper revision 1.1159.226.1 (41f3a631b2JdeX6_Iif82X1YYyLKMw)
Remove debugging from default kernel configs. David Becker points out that
it hurts performance rather a lot!